Small bug fixes

diff --git a/linux-2.6-xen-sparse/include/asm-xen/asm-ia64/hypercall.h b/linux-2.6-xen-sparse/include/asm-xen/asm-ia64/hypercall.h
index e0b41f57eab13b7339a353fe50ed7d88ab07b201..e1bcb49913a45a3ef613dabf211c180ba57ed13a 100644 (file)
--- a/linux-2.6-xen-sparse/include/asm-xen/asm-ia64/hypercall.h
+++ b/linux-2.6-xen-sparse/include/asm-xen/asm-ia64/hypercall.h
@@ -372,7 +372,7 @@ HYPERVISOR_memory_op(
     int ret;
     __asm__ __volatile__ ( ";; mov r14=%2 ; mov r15=%3 ; mov r2=%1 ; break 0x1000 ;; mov %0=r8 ;;"
         : "=r" (ret)
-        : "i" (__HYPERVISOR_console_io), "r"(cmd), "r"(arg)
+        : "i" (__HYPERVISOR_memory_op), "r"(cmd), "r"(arg)
         : "r14","r15","r2","r8","memory" );
     return ret;
 }

diff --git a/xen/arch/ia64/xen/domain.c b/xen/arch/ia64/xen/domain.c
index eafd6dda5aaef1446c61b8f63eaf6e77181fa466..21209d8987c9383745e925422673401e007ad7b1 100644 (file)
--- a/xen/arch/ia64/xen/domain.c
+++ b/xen/arch/ia64/xen/domain.c
@@ -419,7 +419,7 @@ extern unsigned long vhpt_paddr, vhpt_pend;
                {
                        p = alloc_domheap_page(d);
                        // zero out pages for security reasons
-                       memset(__va(page_to_phys(p)),0,PAGE_SIZE);
+                       if (p) memset(__va(page_to_phys(p)),0,PAGE_SIZE);
                }
                if (unlikely(!p)) {
 printf("map_new_domain_page: Can't alloc!!!! Aaaargh!\n");